@@ -1,35 +1,45 @@ |
||
1 |
-mysqldata: |
|
2 |
- image: mysql:5.7 |
|
3 |
- command: /bin/true |
|
1 |
+# This needs at least compose 1.6.0 |
|
2 |
+version: '2' |
|
4 | 3 |
|
5 |
-mysql: |
|
6 |
- image: mysql:5.7 |
|
7 |
- volumes_from: |
|
8 |
- - mysqldata |
|
9 |
- environment: |
|
10 |
- MYSQL_ROOT_PASSWORD: myrootpassword |
|
11 |
- MYSQL_DATABASE: huginn |
|
12 |
- MYSQL_USER: huginn |
|
13 |
- MYSQL_PASSWORD: myhuginnpassword |
|
4 |
+services: |
|
5 |
+ mysqldata: |
|
6 |
+ image: mysql:5.7 |
|
7 |
+ command: /bin/true |
|
14 | 8 |
|
15 |
-huginn_web: |
|
16 |
- image: cantino/huginn-single-process |
|
17 |
- restart: always |
|
18 |
- extends: |
|
19 |
- file: environment.yml |
|
20 |
- service: huginn_base |
|
21 |
- ports: |
|
22 |
- - 3000:3000 |
|
23 |
- links: |
|
24 |
- - mysql |
|
9 |
+ mysql: |
|
10 |
+ image: mysql:5.7 |
|
11 |
+ volumes_from: |
|
12 |
+ - mysqldata |
|
13 |
+ environment: |
|
14 |
+ MYSQL_ROOT_PASSWORD: myrootpassword |
|
15 |
+ MYSQL_DATABASE: huginn |
|
16 |
+ MYSQL_USER: huginn |
|
17 |
+ MYSQL_PASSWORD: myhuginnpassword |
|
25 | 18 |
|
26 |
-huginn_threaded: |
|
27 |
- image: cantino/huginn-single-process |
|
28 |
- restart: always |
|
29 |
- extends: |
|
30 |
- file: environment.yml |
|
31 |
- service: huginn_base |
|
32 |
- links: |
|
33 |
- - mysql |
|
34 |
- command: /scripts/init bin/threaded.rb |
|
19 |
+ huginn_web: |
|
20 |
+ image: cantino/huginn-single-process |
|
21 |
+ restart: always |
|
22 |
+ extends: |
|
23 |
+ file: environment.yml |
|
24 |
+ service: huginn_base |
|
25 |
+ ports: |
|
26 |
+ - 3000:3000 |
|
27 |
+ links: |
|
28 |
+ - mysql |
|
29 |
+ environment: |
|
30 |
+ MYSQL_PORT_3306_TCP_ADDR: mysql |
|
31 |
+ MYSQL_PORT_3306_TCP_PORT: 3306 |
|
32 |
+ |
|
33 |
+ huginn_threaded: |
|
34 |
+ image: cantino/huginn-single-process |
|
35 |
+ restart: always |
|
36 |
+ extends: |
|
37 |
+ file: environment.yml |
|
38 |
+ service: huginn_base |
|
39 |
+ links: |
|
40 |
+ - mysql |
|
41 |
+ command: /scripts/init bin/threaded.rb |
|
42 |
+ environment: |
|
43 |
+ MYSQL_PORT_3306_TCP_ADDR: mysql |
|
44 |
+ MYSQL_PORT_3306_TCP_PORT: 3306 |
|
35 | 45 |
|
@@ -1,7 +1,11 @@ |
||
1 |
-huginn_base: |
|
2 |
- environment: |
|
3 |
- DATABASE_ADAPTER: mysql2 |
|
4 |
- DATABASE_NAME: huginn |
|
5 |
- DATABASE_USERNAME: huginn |
|
6 |
- DATABASE_PASSWORD: myhuginnpassword |
|
7 |
- APP_SECRET_TOKEN: 3bd139f9186b31a85336bb89cd1a1337078921134b2f48e022fd09c234d764d3e19b018b2ab789c6e0e04a1ac9e3365116368049660234c2038dc9990513d49c |
|
1 |
+# This needs at least compose 1.6.0 |
|
2 |
+version: '2' |
|
3 |
+ |
|
4 |
+services: |
|
5 |
+ huginn_base: |
|
6 |
+ environment: |
|
7 |
+ DATABASE_ADAPTER: mysql2 |
|
8 |
+ DATABASE_NAME: huginn |
|
9 |
+ DATABASE_USERNAME: huginn |
|
10 |
+ DATABASE_PASSWORD: myhuginnpassword |
|
11 |
+ APP_SECRET_TOKEN: 3bd139f9186b31a85336bb89cd1a1337078921134b2f48e022fd09c234d764d3e19b018b2ab789c6e0e04a1ac9e3365116368049660234c2038dc9990513d49c |
@@ -1,72 +1,86 @@ |
||
1 |
-postgresdata: |
|
2 |
- image: postgres:9.5 |
|
3 |
- command: /bin/true |
|
1 |
+# This needs at least compose 1.6.0 |
|
2 |
+version: '2' |
|
4 | 3 |
|
5 |
-postgres: |
|
6 |
- image: postgres:9.5 |
|
7 |
- volumes_from: |
|
8 |
- - postgresdata |
|
9 |
- environment: |
|
10 |
- POSTGRES_PASSWORD: myhuginnpassword |
|
11 |
- POSTGRES_USER: huginn |
|
4 |
+services: |
|
5 |
+ postgresdata: |
|
6 |
+ image: postgres:9.5 |
|
7 |
+ command: /bin/true |
|
12 | 8 |
|
13 |
-huginn_web: |
|
14 |
- image: cantino/huginn-single-process |
|
15 |
- restart: always |
|
16 |
- extends: |
|
17 |
- file: environment.yml |
|
18 |
- service: huginn_base |
|
19 |
- environment: |
|
20 |
- DATABASE_ADAPTER: postgresql |
|
21 |
- ports: |
|
22 |
- - 3000:3000 |
|
23 |
- links: |
|
24 |
- - postgres |
|
9 |
+ postgres: |
|
10 |
+ image: postgres:9.5 |
|
11 |
+ volumes_from: |
|
12 |
+ - postgresdata |
|
13 |
+ environment: |
|
14 |
+ POSTGRES_PASSWORD: myhuginnpassword |
|
15 |
+ POSTGRES_USER: huginn |
|
25 | 16 |
|
26 |
-huginn_threaded: |
|
27 |
- image: cantino/huginn-single-process |
|
28 |
- restart: always |
|
29 |
- extends: |
|
30 |
- file: environment.yml |
|
31 |
- service: huginn_base |
|
32 |
- environment: |
|
33 |
- DATABASE_ADAPTER: postgresql |
|
34 |
- links: |
|
35 |
- - postgres |
|
36 |
- command: /scripts/init bin/threaded.rb |
|
17 |
+ huginn_web: |
|
18 |
+ image: cantino/huginn-single-process |
|
19 |
+ restart: always |
|
20 |
+ extends: |
|
21 |
+ file: environment.yml |
|
22 |
+ service: huginn_base |
|
23 |
+ environment: |
|
24 |
+ DATABASE_ADAPTER: postgresql |
|
25 |
+ POSTGRES_PORT_5432_TCP_ADDR: postgres |
|
26 |
+ POSTGRES_PORT_5432_TCP_PORT: 5432 |
|
27 |
+ ports: |
|
28 |
+ - 3000:3000 |
|
29 |
+ links: |
|
30 |
+ - postgres |
|
37 | 31 |
|
38 |
-# huginn_schedule: |
|
39 |
-# image: cantino/huginn-single-process |
|
40 |
-# extends: |
|
41 |
-# file: environment.yml |
|
42 |
-# service: huginn_base |
|
43 |
-# environment: |
|
44 |
-# DATABASE_ADAPTER: postgresql |
|
45 |
-# links: |
|
46 |
-# - postgres |
|
47 |
-# command: /scripts/init bin/schedule.rb |
|
32 |
+ huginn_threaded: |
|
33 |
+ image: cantino/huginn-single-process |
|
34 |
+ restart: always |
|
35 |
+ extends: |
|
36 |
+ file: environment.yml |
|
37 |
+ service: huginn_base |
|
38 |
+ environment: |
|
39 |
+ DATABASE_ADAPTER: postgresql |
|
40 |
+ POSTGRES_PORT_5432_TCP_ADDR: postgres |
|
41 |
+ POSTGRES_PORT_5432_TCP_PORT: 5432 |
|
42 |
+ links: |
|
43 |
+ - postgres |
|
44 |
+ command: /scripts/init bin/threaded.rb |
|
48 | 45 |
|
46 |
+ # huginn_schedule: |
|
47 |
+ # image: cantino/huginn-single-process |
|
48 |
+ # extends: |
|
49 |
+ # file: environment.yml |
|
50 |
+ # service: huginn_base |
|
51 |
+ # environment: |
|
52 |
+ # DATABASE_ADAPTER: postgresql |
|
53 |
+ # POSTGRES_PORT_5432_TCP_ADDR: postgres |
|
54 |
+ # POSTGRES_PORT_5432_TCP_PORT: 5432 |
|
55 |
+ # links: |
|
56 |
+ # - postgres |
|
57 |
+ # command: /scripts/init bin/schedule.rb |
|
49 | 58 |
|
50 |
-# huginn_twitter_stream: |
|
51 |
-# image: cantino/huginn-single-process |
|
52 |
-# extends: |
|
53 |
-# file: environment.yml |
|
54 |
-# service: huginn_base |
|
55 |
-# environment: |
|
56 |
-# DATABASE_ADAPTER: postgresql |
|
57 |
-# links: |
|
58 |
-# - postgres |
|
59 |
-# command: /scripts/init bin/twitter_stream.rb |
|
60 | 59 |
|
60 |
+ # huginn_twitter_stream: |
|
61 |
+ # image: cantino/huginn-single-process |
|
62 |
+ # extends: |
|
63 |
+ # file: environment.yml |
|
64 |
+ # service: huginn_base |
|
65 |
+ # environment: |
|
66 |
+ # DATABASE_ADAPTER: postgresql |
|
67 |
+ # POSTGRES_PORT_5432_TCP_ADDR: postgres |
|
68 |
+ # POSTGRES_PORT_5432_TCP_PORT: 5432 |
|
69 |
+ # links: |
|
70 |
+ # - postgres |
|
71 |
+ # command: /scripts/init bin/twitter_stream.rb |
|
61 | 72 |
|
62 |
-# huginn_dj1: |
|
63 |
-# image: cantino/huginn-single-process |
|
64 |
-# extends: |
|
65 |
-# file: environment.yml |
|
66 |
-# service: huginn_base |
|
67 |
-# environment: |
|
68 |
-# DATABASE_ADAPTER: postgresql |
|
69 |
-# links: |
|
70 |
-# - postgres |
|
71 |
-# command: /scripts/init script/delayed_job run |
|
73 |
+ |
|
74 |
+ # huginn_dj1: |
|
75 |
+ # image: cantino/huginn-single-process |
|
76 |
+ # extends: |
|
77 |
+ # file: environment.yml |
|
78 |
+ # service: huginn_base |
|
79 |
+ # environment: |
|
80 |
+ # DATABASE_ADAPTER: postgresql |
|
81 |
+ # POSTGRES_PORT_5432_TCP_ADDR: postgres |
|
82 |
+ # POSTGRES_PORT_5432_TCP_PORT: 5432 |
|
83 |
+ # links: |
|
84 |
+ # - postgres |
|
85 |
+ # command: /scripts/init script/delayed_job run |
|
72 | 86 |
|